Merge
authordjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Fri, 13 Jan 2006 20:12:24 +0000 (14:12 -0600)
committerdjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Fri, 13 Jan 2006 20:12:24 +0000 (14:12 -0600)
commit0070cb1f3aabd32a27bcd8fd8aeeb993c6e69772
tree076071cd6648e31d2aee725a0b5a23073e226a4b
parent542362015edbf76293862c5320692fa5dbe55ba0
parent0828aa84f798e1553348322962f73a843ecdfb8c
Merge
xen/arch/ia64/xen/xensetup.c
xen/include/asm-ia64/config.h